Make the code clearer. (#155239, Murray Cumming)

2004-10-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make
	the code clearer.  (#155239, Murray Cumming)

diff --git a/ChangeLog b/ChangeLog
index 2b1b4712db1c223c5ca2237a1bbc604ac3dcbf75..2ebf9fe2885b24f33866845893e2da3ca72b5680 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make
+       the code clearer.  (#155239, Murray Cumming)
+
        * gtk/gtkicontheme.c: Small fixes.
 
        * gtk/gtkrc.c: Include gtkmodules.h.  (#155885, Kazuki IWAMOTO)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2b1b4712db1c223c5ca2237a1bbc604ac3dcbf75..2ebf9fe2885b24f33866845893e2da3ca72b5680 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make
+       the code clearer.  (#155239, Murray Cumming)
+
        * gtk/gtkicontheme.c: Small fixes.
 
        * gtk/gtkrc.c: Include gtkmodules.h.  (#155885, Kazuki IWAMOTO)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2b1b4712db1c223c5ca2237a1bbc604ac3dcbf75..2ebf9fe2885b24f33866845893e2da3ca72b5680 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make
+       the code clearer.  (#155239, Murray Cumming)
+
        * gtk/gtkicontheme.c: Small fixes.
 
        * gtk/gtkrc.c: Include gtkmodules.h.  (#155885, Kazuki IWAMOTO)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2b1b4712db1c223c5ca2237a1bbc604ac3dcbf75..2ebf9fe2885b24f33866845893e2da3ca72b5680 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make
+       the code clearer.  (#155239, Murray Cumming)
+
        * gtk/gtkicontheme.c: Small fixes.
 
        * gtk/gtkrc.c: Include gtkmodules.h.  (#155885, Kazuki IWAMOTO)

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 6d83fb16093dabed3214396829ff5c3a10847391..122afa10f09ecfccd30f4ae88a54abacb926a9c0 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -2417,11 +2417,10 @@ gtk_tree_model_filter_new (GtkTreeModel *child_model,
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
 
-  retval = GTK_TREE_MODEL (g_object_new (gtk_tree_model_filter_get_type (), NULL));
-
-  gtk_tree_model_filter_set_model (GTK_TREE_MODEL_FILTER (retval),
-                                   child_model);
-  gtk_tree_model_filter_set_root (GTK_TREE_MODEL_FILTER (retval), root);
+  retval = GTK_TREE_MODEL (g_object_new (GTK_TYPE_TREE_MODEL_FILTER, 
+                                        "child_model", child_model,
+                                        "virtual_root", root,
+                                        NULL));
 
   return retval;
 }